Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Jun 2011 08:12:23 +0000 (01:12 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Jun 2011 08:12:23 +0000 (01:12 -0700)

Trivial merge